Almost done with the clean up.
I know, I'm also looking farward for the new pages but it takes a lot of work!
