Remove old butler code
Added rule for needs: patch