Removed deprecated classes.
Removed commented code.