Fix distortion and remove unused imports