#36 BoxImpl cleanup