Cleaning up lessons some
Make it safe to pass nullptr through to cleanup