Cleaning almost done

About to start fixing the broken stuff that I have left behind with all
these recent massive changes.