code cleanup

fixed name
removed deprecated classes
code cleanup

fixed name in comments