remove cruft; can add credential directly
remove cruft
fix crasher
cleanup
more crasher fixes
consolidate