Removed uncessary templates