Remove uses of class_eval

@localshred 
Valid.