cleanup + external config files
cleanup + external config files