Cleanup to start over with Eclipse