rermove some leftovers in af1c7fd