finished removing spurious refs to gone controller