Moved removing some mathods to xmltool
correcting xml