finished remove still needs testing