Remove deprecated :use directives and add some aliases