Remove autoclose for now