removing some leftovers from previous PR