Cleanup. Let's see what breaks...