Finished the TODO in onDisable

Hopefully that TODO will save properly! :D