P2 inputs
Revert "P2 inputs"

This reverts commit 4f1f4c738cdce4bdf89a0ab9ffbe6fd8705a4ef5.