Fixed remove not working...