Remove apt as seperate roles, excessive.