Implemented Remove.

Unit tests work too.
Quick typo fix for unit test.