Uncomment some code, clean up to a nicer working state.