Clean up mess