Cleanup Id Entry