Remove logger
Code optimization