Marc: remove unnecessary variables from Class