Cleaned up some XMLs and removed Log messages that are not part of error catching.