Remove XSApplication and XSApplicationArgument for now...