Starting general cleanup.