remove references to General API