Remove legacy leftovers