Revert "Simplier way to rest input data"

This reverts commit 8331efd6b4bdafbedb62df4701442edf3bdc01cb.