remove this unneeded class
rename config options