deleted old defs
deleted a few obsolete defs