upgrade to bs3 and clean up