Removal of useless code

Yet again another removal of useless code, this time removing aliases
that do not need to be there at all.