Cleaned up some residues.