Remove bounding box hacks