Simplify drain script

Issue #71