Code cleanup
More code cleanup and dynamic link name for vcs refresh