remove unused methods and use logger