remove dependency on citadel