removed unneeded aliases
clean up aliases
clean up aliases
Merge branch 'feature/issue_11_remove_unused_aliases' into develop