Remove unused args 'amap' and 'fu_p'