Removing static references to bs