Remove alias + useless code