OCD and removed unnecessary logging