Fix encoding #1 and remove old dummy copy