WIP cleaning up droplets version