more code clean up

TECH