[#6] Event delete using directive
[#6] Delete waste code