removed some (commented-out) obsolete definitions