Cleanup, no functionality change