Cleanup variable definitions