Drop super-class, was just making more noise than was worth