More code cleanup (#1406)

Commit

6 years ago

More code cleanup (#1406) * more cleanup * More cleanup * fix build break. * update