some more boxes cleanup