Final clean-up before beginning re-documentation