Clean up for Eclipse