Remove commented code, unsed things and adjust arrows usage