Removed unwanted remains from a merge