Issue #70 - Clean up of require and module dependencies for import