Remove own module calls