Remove all references to constats files

Missed a few spots where constants were still being used, remove them.