move util class
remove unused method