[] added some logs and removed unused header includes;