Cleanup eclipse more