Cleanup the boxes to actually work