SAK-25440 cleanup

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/SAK-25440@132353 66ffb92e-73f9-0310-93c1-f5514f145a0a