Drop obsolete API usage