Enable add and remove command
Fix imports
Remove unused import