[TASK] Format code using class alias and remove obsolete bits

Change-Id: I29aba90b24cd7702223144244a8f5f06fb1352c6