Updated delete message handler
Added top thresholds
Minor fixes
Added delete method, restore func usage extended