2nd Commit/Cleanup