That was my conclusion - the fix was to delete the old code that was left in.