remove extraneous cruft
removed more