Cleanup and use instantiation