Cleanup the fs a bit