Removing unnecessary getters and setters