Code cleaning

Remove some unused imports