Fix my own cleanup