Revert "Ajay branch2"

Reverts sli-fox/jamms#29