Clean up and add deinit
Noon bug