deleted some now-unused code