Cleaning up before big update