cleanup generate_hash
move generate_id to soap builder