Update cleanup_branches

Add better option handling