remove rank as separate entity