Remove unused files after merging simplified conf version