Clean up leftovers of old version