Eclipse clean up