BLUE-9 : Clean up tabs