Cleaned up old files and comments