removed some old non-generic code.