Use prebuilt infrastructure for 'box?'
Remove dead commented code