Code cleanup

Cleaned up comments and useless commands