Final Cleanup and Commit