spring cleaning - some old APIs which are not used anymore were removed