Cleanup and add new aliases