[TASK] Remove obsolete class aliases