Removed duplicated code which was adding duplicated separators