Cleaned up comments and old TODO statements.