clean up and change action