Clean up my own mess