Should we remove this (empty) class?