Clean up old imports
Remove unused ops from verify
fix missing import in rpm module