remove unnecessary weak self references