missed a few things in the last commit about removing things that are not needed