Delete unused visitors and fix expressionhandler