Cleaned up comments and removed unused code