Cleanup of SVC Extension - adronhall