Remove dup file and put yield in body