cleanup variable definitions