Rearranged cleanup items and added new ones.