clean up for eclipse replacement