removed logging, code cleanup