misc cleanup
MPL 2 upgrade