Restructuring controller delete #2