removed unused code, logging