Revert "Modular inputs changes"

This reverts commit fb5ecac4f6fa25912a7b9c30e116383981f61eb1.