some leftovers removal