Dec 27 2014, mainly redo delete mechanisms