Removed NO-OP function