Remove Markers + Tweak Stream API