Tried a more efficient way of doing remove