More cleanup - remove some unused stuff, simplify some Object creation, remove some redundant trace calls.