Global code optimization. Removed custom XML selectors.