Remove vs related stuff