Fix demos, remove unnecessary event signature