Removing element feature (for now) and improving FluidInstance API