cleaning up
remove immutability - doesn't work with back step and other potential problems