remove old stuff
create temp getters and setters