Small bug fix and removal of some logging lines