Clean up ioflo master more