Vcs: Make sure legacy settings get removed

Change-Id: I6a55414a5f14984102277050d5b22e2e98741656
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>