1) cleanup of AppConstants class