Further cleaing after memory leak fix