Removed storm monkeypatching from Mamba. Sovles #28 and PYM-9.