allow to remove build keys from tags and id

Change-Id: I4d0329849edf2a32a47a69b6ada6a9c0a9ec3902