Removing consistent-return

Closes #239