Removing mod 2 tweaks
Tidying up