Don't use VAR_ASSIGN and VAR_ASSIGN_AND_RENAME

because they change the order of the files.
Remove debug code