Getting ready for scaffholding code cleanup