Minor updates to remove references to Ultracraft

Removing various references to Ultracraft, and generally cleaning up the
sample code.