Remove actions, refactor.