More clean up. Remove contructor in subclass.