Refactored to remove --module AMD support