remove a buch of cruft