Fixes (at least in theory) the highlight method according to the new models and eliminates unused code related to the sandbox.