Update prep

Preparation for the upcoming Flutter Version updates.

Fixes for upcoming annotation errors and warnings.

As well as removal of apparently unused files as marked by Dart Code Metrics. Those need to be double checked!