Removed templates since they are no longer used