First round of removing BP traces... also removed modal stuff. Not working yet, though.