Remove BaseKit class usage.