[!!!][TASK] Remove last batch of old class aliases