Changes to remove freewheel codes