Remove needless aliases and fix some functions