Revert "Merging changes from MLstate"

Reverts ndziorlg/opalang#1