Buffer delete shortcut, code cleaning