removed some accidental leftovers from last merge