Revert "Gadget Implementation with B matrix"

This reverts commit f452e49920400a04353e506f4a335233baa64d16.