Add a GPS and a few propellers to vapes so they can fly themselves directly into the nearest river, lake or (as a last resort) ocean once they're empty.