Delete usage
Add test & refactoring