removed old cruft