Removed accidentally left in merge code