Nishi #00 removing old incorrect remedi xmls and refactoring