remove unused code
remove unused config
refactor