Remove unecessarly locals before return
Unused imports