Code cleanup, no changes