Three classes that don't exist anymore

Change-Id: I26bf9ac0777851bac7357172fccb40d83fcfc906