Fixed remove scope