Clean up of variables