Remove AutoClose as no longer being used