remove the final constant usage from across the app