hacked through remove implementation and test