Clean up mimio lock removals a bit.