cleanup and push