Fixed up specs and took out editdestroy