CLEANUP: Removed use of index for finding modules.