Patched logic error in remove. Finished.