[FIX] Refactoring + Collection DELETE
[FIX] Refactoring + Collection DELETE
[FIX] Collection delete