Cleaning Up

Final steps.