More violations removed, duplicate code removed.