Clean up glusterfs module and state

Cleaning up a few small things.