remove dirty comments and logging