More slab cleanup