Added delete fix, simple format