Args cleanup