removed old skip code