Remove deprecated and unused aliases