Commented out some code.
Removed deprecated code.