Fixed removal of the old trustmanager