bug fixes, removed unnecessary arguments, minor clean up
Authored by: agarwalamit 2015-03-03
Parent: [r32363]
Child: [r32365]