eva code clean up