Clean up some aliases!