c++ seems to be fine now
Added deconstructors