added cleanup and prepare to State Updater proxy