Cleanup simplify code

Authored by mreeves on Sep 13 2018, 3:57 AM.