cleanup of some cruft --KW