Tested some more removes.