Finishing discussion delete functionality along with comments
Merging branch