[Drops] Clean up