Remove unrelated methods
Rename utility class to utility class naming convention