Attempt to clean up some user operations