ran the cleanup script against the whole solution with the linked gist

https://gist.github.com/JayBazuzi/9e0de544cdfe0c7a4358