Memory leak fix + removed this. from context