Further code cleanup. Might need to create multiple model.xml files to
handle different stages of pmml build.