Remove getters and setter