Cleanup after merging from Eclipse.

Title.