refactoring scope
fix remove
check and fix api
fix remove functionality
refactoring