Removed dead code and refactored BoundingBoxes.