Cleaned up comments, old code