Write javadoc for new datamodel classes , remove some incomplete staff