Remove some leftover defines from old api