redesign request: remove pre handler