2.7.1 code cleanup added id