removed some leftovers from the merge