Remove custom getters and setters