CCAPI Student Controller cleanup