Remove versionadded 2.1