Cleanup and making it compile again.