Removed redundant aliases, clean up