Cleanup due to bs upgrade