cleanup keyless entries code