Cleanup after weird merge