Revert "Revert "Remove unneeded and outdated classes""

This reverts commit d3a22f9b2d69db022f306f16b1ecfa881968d609.