code clean up.(DHH-518)