Maint/stable/remove version 16x references