Remove old ws_handler