cleanup
removed unused file
nest options in configuration files