Add some cleanup actions