remove old file selectors
remove old file selectors - continuation
fix positional mistakes in signature offset