Post CW Cleanup

[EdHurtig]

There were a lot of changes that were made at CW that should be cleaned up now.

[EdHurtig]

See Items Labeled HouseKeeping