This thing keep pulling in stuff I don't need. Another round of tidying