Initial clean-up.  Make it work.