Use newer TeamCity
Tidying up after the refactor
Updates to messages