Small changes - removed some comments and unused logs