Changed: removed logging statements