General cleanups

Clean up a few options between ARK and Fedora. It also removes a few options removed upstream. There's no function changes here.

Signed-off-by: Peter Robinson pbrobinson@redhat.com