Changed old destroy call to new one. Fixes #58 and parts of #53