Remove psvm from the classes.