Message delete refactored