clean up, removed useless logging statements