Refactor out unrelated modules