Cleaned up the mess Eclipse made