Replaced invalid call to .destroy() with delete
Got ride of some functions that dont exist anymore
Merged