Removed some long-unused defs from citadel.h