Removed redundant&/deprecated aliases