Variables cleanup