Cleaning up more code, system generated by config
Merge pull request #14 from fkautz/pr_out_cleaning_up_more_code_system_generated_by_config

Cleaning up more code, system generated by config