Removed flatten calls.