remove cruft and add reuseIdentifier