Fixed cleanup, yay!