Cleaning up Gate and Once