Cleanup and reorientation since Live