Removed sflow and some cleanup.