code clean up only