Cleaned up some files and also killed some demons that had survived
the messaging update.