Clean up Boxes with comments & guards