#124 Alias classes removal