more intentions cleanup