Remove the old api