more cleanup: less object properties