Final Commit Before Merge, cleanup.