Removing explicit imports for internal modules