Remove moved code from rootcontroller