Better failure message
cleanup
Fill out step def for Opaque Repository