Remove some stuff
Class contracts