[upd] Cleanup code