removed comments and unnecessary logging messages