More require cleanup