remove unnecessary log statements
remove unused variables