remove remains of BS2 compatibility shims

These were added to prevent compilation errors as they no longer
exist in Bootsrap 3. Most have fairly simple translations.
temp fix style
Merge #116