Removed commented dead code

Still plenty of other dead code to remove