Added a remove operation, tested it, and cleaned up the API