remove unused import + delete useless vars