Refactor Activities, now with timezone info and delete