Removing VisualBasic dependency