@havvg done: remove class name. Also squashed and rebased.