some aliase cleanup