Removed ALL extraneous options and generally cleaned everything up.