fix + removed some logs