remove util
Merge branch 'dev'