Removed support for print, which is likely to change before it is supported anyways
Removed explicit null checks (should rather be done as xsd validation)