Add omnibus, clean out stuff we don't need