Removing spare logs and commented code lines