Remove inheritance based method in favor of decorators