Possibly failed attempt at monadic composition
Revert "Possibly failed attempt at monadic composition"

This reverts commit cb6d4282d9e81358505d9ac8ec2805ac4382a0b7.
Remove cleanup code (just cluttering things for now)
Attempted monadic composition fixes