removed commented out old cruft