cleanup
clean up (don't need/use a custom exception class)
turn off deferral, add comments
Merge branch 'release/1.0.0-beta'