Revert "varius bax fixes, code tidy"

This reverts commit 2641766c3d105721733462cd94df22f9f5156da2.