Clean up of a few things