[!!!][TASK] Remove a series of old class aliases