Remove PATCH from 2.0 and 2.1