removed old cruft
changed name