Removed uneeded templates