updated relationships; cleaned not necessary annotations