Refactor, code clean and delete request support