Cleanup moving of settings