Cleaned up comments and old stuff