Cleaned up unused segments, more work.