Remove remaining methods calls to combat logger