warmup code cleaned up