general: cleanup unused files and make sure all options are available both as XML tags and attributes