[JRO] Clean up after changing singleton state