Remove needless nesting