remove several references, update structure_of_code