some fixes for b3
remove index