new aliases and cleanup