code cleanup, no other changes