tidy up unused crap, set cinoptions