massive destructor fix because of valgrind analysisC
merged conflicts