Remove global cleanup, since it could do unwanted unregisters
TODO: Cleanup on interrupt registered Templates