Remove volume checks