cleanup and remove v1.6