removed unused code
cleaned and updated ontologies and java vocabulary