Removed old cruft