Affordance + Action cleanup

Also is failure/success