remove use of constants as configuration options