Cleaning up some aliases