Code cleanup, comments, removal of support for a custom asynclistener since it's too dangerous