Cleanup state args