Cleaning up residuals in charvis make study

Charvis make study still has a bunch of stuff left over from Charybdis.