Still cleaning up eclipse's mess