OC-1868: Remove dependences from accountType and authorities