Clean up a bit first