Changed defclass* to defclass.
Keep doing refactoring.
Fixed use-xeps utility
Merge branch 'feature-client-high'