BUGFIX: Forgot to add erase call to the remove function when removing