Removed non-generic aliases and functions