Removed redundant tasks import from __init__.py, it was being autoloaded in the configuration.  Also performed a quick refactoring of imports