removed mem leakage