Revert "Ajay branch3"

Reverts sli-fox/jamms#66