Cleanup: Removed not used attributes +comments, etc.