remove needless nesting