This whole class looks wrong (copy & paste?). Can it be removed?