cleaning up my own mess