Move TTL and SimplePush out of criteria