removed all logging calls