Fixed remove prepared