ONS download now works. rm some duplication. rm TODO comments.