Eclipse cleanups