Correction and dual function remove in not used file!