But these 2 classes seem to be never been used.
I'd need help from @bdunogier to figure out if we can remove them.