De-extra-confed stuff - yay!

Signed-off-by: JC <jay@spruceboy.net>