Remove BaseNamedModel properly
ABC wtf fixed