Ben: remove unnecessary class