Removed some unused imports and some template changes