Clean extra variables