Cleanup some stuff...