One more small cleanup