Removed VIMN specific code