Code cleanup

Removed some unneeded stuff including both code and comments.