Code cleaning

Redundant code, unused imports, ...