remove logging and helper