Clean up more red/blue methods