Clean up a few aliases