[#ARCH-170 Permanent Delete API, #ARCH-153 Provide Trash and Trash CleanUp Service]

Refactoring