Update to 0.17 and remove old cp