Refactor code
Enable remove attachment feature under edit menu