Remove lagacy code replacing handler.