clean-up. optimization me2 eclipse problem