small clean up of unused code