Remove some old leftovers