Removes duplication between fill and drain