SIFD-9 removing redundant code