removed further useless cruft