Drop type aliases that just bring confusion