Cleanup methods, move responsibility of changing state to transition.