Cleanup...  No functional changes.