Cleaned up code comments and unused code