Worked on remove template