Rewrote remove. Deleted a lot of code that helped remove.