Fixed some false positives and removed unused rules