Cleanup accessor logic and put the defaults back