Remove some reference of unused code...
Remove analyzer of memory leak