MIRAGE: Clean up a bit