Also removed fixes to btn-sm as they have appears to
be already merged into master