Clean up all around