Replace class method
Remove redundant method and tests