Remove all the binder stuff except actual state creation