Add util
Remove deprecated entities