Cleaned up code base: Removed unused code, invalid comments, etc.