Minor cleanup of commented out code