removed comments and logs