Adding CDI annotations to make it simpler to setup. Clearing out a couple of dead-end classes that never wound up doing anything.