Removed auto delete for now