TeamCity Test Commit 3

More cleanup