Removed more unnecessary constructor/destructor declarations