removed unused import, singular fields false positives deactivated