Cleaned up lot of original XML related code which was carried from Selenium add-on code.