Fixing delete (broken by new adding form) and removing useless stuff