Removed commented code
Removed TODO comments