Remove unused schema references
Move annotations to the right place
Move generic property converter to core to make it available in coa