Fixed request list cleanup in drain

cleanup was not removing unconnected pumps correctly. Now if there is no
pipe network connection to the pump it will be removed.