Cleaning up aliases