Cleaning up to match prod and branch