Cleanup, rewrite reloading