remove unnecessary references to __call__