Move more misplaced code to the SCUD controller