removed commented code

Removed all commented, unused code.