cleanup hacky code that tested subclasses