code cleanup III build-set