Cleaning up some things...