BSP Builder: Cleanup