moving rs from alias to function, cleaning up existing aliases