remove commented code
clean import