Cleanup on DevOps utilities