Cleaning up some stuff...