small cleanups, remove --cycle for patches