More cleanup by removing extra code parameter