OK, I removed unnecessary code cleanup.