Clean up old stuff; refactor to "data is code"