Do a better job of cleaning up