more cleanup - removed cruft, did code inspection changes