more manual cleanup