clean up of constants