[TASK] Remove unneeded max value check