good catch, these were left over from the hardcoded implementation