Removed some unused code

Removed outdate commented out code