Clean up for Eclipse functionality