need code clean up due to changes
Authored by: samantprajakta 2014-03-13
Parent: [r1859]
Child: [r1861]