Just put this in the above function, no need for two unload handlers