PIPET-36: Removing unused imports