Remove some leftovers