Changes few comments and removed unused imports.