#54 removed old cruft