Clean up extra variables