Refactors PostDestroyer
Merge pull request #1905 from velesin/post_destroyer_refactoring

Refactors PostDestroyer