BS-9891, Remove API using old toolkit