Clean-up some things..