Remove ifnotempty validator and decorator