Fix vsn. Cleanup