LPS-49773 Delete all the unnecessary methods in each class and extract common methods to a util class