Cleaned up comments and unused code