Removed unecessary template
Removed todo