Removed warmup specific code