Implementation leftovers