removed some old cruft