-- Removed ObservableCollection references
-- Fixed unused using.