Cleaned out the cruft