add file missing from previous commit, remove un-needed file.

also, handle the possibility of empty tags.