Removed comments and logging tools