removed even more old definitions.