Ben: some cleanup