add proper removing of drained particles. #96