Manual clean up no longer necessary.