More cleaning up. Fixed build.