api-template leftovers removed