Fixed remove and delete scripts