id cleanup towards standardization