Ajay/Yogesh | #2230 | Removed unused templates