Continuing code cleanout to add SV code in more easily.