#156796 by webernet, asimmonds and pwolanin: user editing forms cleanup and fixing deletion API remainings