Clean up aliases
Clean up aliases