Dock: Remove unused set/map containers