Cleanup for more general use