removed more rarely used things.