Cleanup of directed to