Remove class that should not have been added to this branch

Change-Id: I442bd47c3d38900b33a05f15420f825443554695