Get rid of legacy object subclassing