Slim down trigger events for debugging
General cleanup