Missed a few more files

also cleaned up some code