fixes issue with predestroy methods
fixes issue with predestroy method
cleanup