Minor require cleanup