Cleaned up comments and some other minor obsolete code