Remove additional logs, and change include lib method