Cleaned out cruft