One more code cleanup