increase idempotency
clean up cruft left hanging out in /opt/