prune some over-safe logic