Simplify event handling, remove broken autosample logic