remove custom log and replace helpers