Remove double instantiation