cleanup, ci tweaks