Cleanup

Removed old comments