No more need of cleanup_permissions step