remove silly member.id and member references as everything is available in scope anyway