You are right. I am correcting some more issues with unused macros etc and I will update the file.