Made additional fixes and cleanup. Removed titan-test from the build.

The titan-test build was full of errors. I don't know how to resolve them.