Removed unnecessary accessors and checked each class to make sure it will be useful.