Removed unnecessary code from template