Revert "Final version before remake"

This reverts commit a8b151b749fbdcfe806599d12a8779b4d65097ba.