Clean up the rest