Got rid of cruft