Removing some badly merged stuff