Updating comments and removing unused imports