additional drain testing and cleanup /issue #51