remove subs calls