Memory leak removed