fixed some nonsensical artefacts remnant of merge