removeExpansions() method is now null safe
Added menu action for discovering resources + refactoring