general cleanup of cruft