cleanup aliases somewhat