Removed some will be unnecessary substrate stuff.
1.7 update mostly complete.