Merge "Cleanup unused yang models from CPS core"