Continue to tweak delete functions... not yet working