Remove should be working... kinda