Changes brought from main repo

Main repo changes + removal of some logging