Removing all of these APIs _will_ break current implementations of KIF as far as I understand.