Getting rid of cruft