Removed unnecessary getters and setters