Fixed IBusNonGenericsExtensions class name and removed unused references