remove unused code, r18 args fix