Use configuration variable
Use configuration variable and remove unused imports