Removed some leftovers