removed state machine from pickup