Added removing multiton instances