cleaned up some actions